| commit | 7aeb8c8d4437eb8f45be3ad3828764795e14ad4c | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Wed Aug 10 18:02:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 18:02:37 2016 +0000 |
| tree | cb6e3b4a22fd0b68b8fc1eaadcd9d791574d77f9 | |
| parent | 08b045338bb42fa5caefab3fa9ea553c0c52f544 [diff] | |
| parent | b8750e114b6fd99768c45233d4b2ffb2b198f5d1 [diff] |
resolve merge conflicts of 1c10de5 to stage-aosp-master am: 7ad2854adc am: b8750e114b Change-Id: I0425db9834a47bc889b739a5e9ca58deb5416742