| commit | 63ef5a38f82d22c1f97922fe490a1fd336566d5c | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Wed Aug 10 23:50:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 23:50:01 2016 +0000 |
| tree | e84028568dbcede5ffdaf58be20c6cc080028edd | |
| parent | b8750e114b6fd99768c45233d4b2ffb2b198f5d1 [diff] | |
| parent | df5d9246f9607b1c2f8b134c46a05af06e206da3 [diff] |
resolve merge conflicts of fd923e7 to stage-aosp-master am: df5d9246f9 Change-Id: I20767244fef48ad42334c5131e2d402f75bb7327