| commit | 1aa9905aad634649383ba58e4b198f35c858a817 | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Fri Jul 22 03:56:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 22 03:56:14 2016 +0000 |
| tree | f113f04db5d2bfdf7eb6c001d1a03e0175a14f46 | |
| parent | 2556106c4e9447d6c5140972b5870250ac779914 [diff] | |
| parent | e629ced86ac585ea78eaac00140d05c5a06b80d2 [diff] |
resolve merge conflicts of c6e22ba to stage-aosp-master am: e629ced86a Change-Id: Ib3245257d16e2546c4c28d8fa2bef88e156a4090