tree e824c096d6e4dc7d3a2203ed09092108e581a714
parent dbcfd690f1c0cd9655d05f4e73ce267a6048b55f
parent 67ad391ee05255ee068085965448579f10546d27
author David Pursehouse <david.pursehouse@sonymobile.com> 1366243842 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1366243843 +0000

Merge "TrivialRebase: Aggregate approvals" into stable-2.6