| commit | f3a00957508edeb9e117819ea7a466f09a0de172 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Jul 13 07:38:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 13 07:38:12 2016 +0000 |
| tree | 634edbcc2f5ad193f714bb2f9a4cefae13206392 | |
| parent | a343b8c9d828bdd24cc402700d9b5e93beb3f075 [diff] | |
| parent | 7c4c2e0ab8ed74ca346eec98219562bd33814d71 [diff] |
resolve merge conflicts of 41e82a3 to stage-aosp-master am: 2fedbf79bb Change-Id: Ic87dc9fc1e8750df2ed316c12d6320584b0fff97