| commit | 671cb4ba9fee0cca18ba0a925392b2199e08723d | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 03:05:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 03:05:45 2016 +0000 |
| tree | 91ba6abbc50597f609bd036d999d444328b3c41a | |
| parent | 9afb49a9331b3b4fa9f33439b8443f443aa24832 [diff] | |
| parent | 61bc404c0c35bcd68cba0dcca917dd9f4bd24a86 [diff] |
resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4 am: ef57a0d629 am: 61bc404c0c Change-Id: I4b57bb0e5c418a8d3305c0b337afd290a778c9b4