| commit | effb996c069bd0713f8b380c62ba9b0d399772fc | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Mon Oct 31 21:52:20 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 31 21:52:20 2016 +0000 |
| tree | d92f8e0aeac683eea6f6f7a01dcf95d85e2698cf | |
| parent | 2ecd0a7a8ebefa1cdebcf1111b871d480854a0fd [diff] | |
| parent | 2cc2743c2fb00c0cd8c5aded5737c8dc8643fffd [diff] |
resolve merge conflicts of f4cf7f3 to stage-aosp-master am: 2cc2743c2f Change-Id: Ia26d0d66e746dd5bef6ec4af5fcbc6f2be9425be