| commit | 21f8c2e283865d782beb9b667f413ee1a9a77658 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Mon Jun 20 20:52:10 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 20 20:52:10 2016 +0000 |
| tree | a58ca4ffb578c837d9f1d9e3938f155f0bf43475 | |
| parent | 168e44fba3198bcb8f2b6813d5c51a4fd0923913 [diff] | |
| parent | 209467289b44227121943292c44526430afd9e89 [diff] |
resolve merge conflicts of a617e33 to stage-aosp-master am: 9f6b80c9c8 am: 3953bade4b Change-Id: I1d2a758bd99729a53779a161d052dc594f264244