| commit | c964d4788ce7adf3fb9ffc2b7a5f5f9240cd9317 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Wed Aug 10 18:17:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 18:17:03 2016 +0000 |
| tree | 890813c1d6f6e4d644c12d22824ca1d863f02a1c | |
| parent | f6d5a13c3a7a84e35e28b9840dde0f29728b6849 [diff] | |
| parent | 7aeb8c8d4437eb8f45be3ad3828764795e14ad4c [diff] |
resolve merge conflicts of 1c10de5 to stage-aosp-master am: 7ad2854adc am: b8750e114b am: 7aeb8c8d44 Change-Id: I5a38ff0ff16291536a1a7853fefec9f9dcbe0de7