| commit | b6dc53d19176cd8f7fce427381cd96952e160997 | [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 | 569c799481104e2987b0060035bc74d7a6e07bf6 [diff] | |
| parent | ebb17fece985e9f67c1ed3bec1c05b8a4a58f57c [diff] |
resolve merge conflicts of c6e22ba to stage-aosp-master am: e629ced86a Change-Id: Ib3245257d16e2546c4c28d8fa2bef88e156a4090