| commit | ab3c24ceda41c45655e50d0f3a1a58e005a05152 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Wed Oct 26 20:16:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 26 20:16:42 2016 +0000 |
| tree | ec8d73f2e93ba3a7dcfeb55ce74d960ea04d1d34 | |
| parent | eb7aa4267cddafd567a78c9dbef32d9cde34d8ab [diff] | |
| parent | ff13cc20fedec05ef969da676b6687cd5ff437e6 [diff] |
resolve merge conflicts of ab00546 to stage-aosp-master am: bc2af49c21 am: ff13cc20fe Change-Id: I5aea360d11a44b35c781ae32822a559900be34e5