tree 4d8e6b004abe694d5248ab7fee6aeffb35db2748
parent ff812ccb8b46df2b7bc23c84066c9ee7bb1300d3
parent f9c329aa18ce0b490f6039f17a41a6e3f65e3558
author David Pursehouse <david.pursehouse@sonymobile.com> 1432692014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1432692015 +0000

Merge "Merge branch 'stable-2.11'"