tree fcfbed9cc3edc9bd922cb7ff7ea0b7b3ad8a33d9
parent 8879e15746e1eb6008a9b907c4f3d429b83cf5f4
parent 93768c3ef584d133c529b1b42f1b9a8f84b57720
author David Pursehouse <david.pursehouse@sonymobile.com> 1429521752 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1429521754 +0000

Merge "Merge branch 'stable-2.11'"