| commit | 821d5d2397568b28b40c911c6a57399ea52890b4 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Nov 16 07:08:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 16 07:08:33 2016 +0000 |
| tree | 65410f83e121df55cbdec80e9b2f746096810cf7 | |
| parent | 7e3d156b86b816588379484640f32b66f5bfe4c8 [diff] | |
| parent | 7f0a56dbf15fbf41f7f2b800ab73093de940d503 [diff] |
resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 am: 7f0a56dbf1 Change-Id: Ic484035e3e1f020d0e96dca64bd0d9339d27d398