| commit | 9be03581efacd6a1c162cecd9447bee1a2a8b0ef | [log] [tgz] |
|---|---|---|
| author | Chih-hung Hsieh <chh@google.com> | Mon Jun 27 21:41:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 27 21:41:51 2016 +0000 |
| tree | a121ca57d81bd0315bfc5d772922e410b041a3da | |
| parent | 0179803560e67a1d0678c507c7c52fc48daacbb7 [diff] | |
| parent | ab757b423f68f96093fd56bd0b82a393014cc7dc [diff] |
resolve merge conflicts of 079d417 to stage-aosp-master am: 64b0e44329 am: 9197c89071 am: ab757b423f Change-Id: If26141a6ea6bc4d7f9e2966cbd1b7309530c634e