| commit | a4b4e731d18d92ff0f267cf8c17632679b007e11 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Thu Dec 01 00:07:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 01 00:07:02 2016 +0000 |
| tree | f194078f16b7ba6224fc64bca267cb89852d48f2 | |
| parent | e1faff16014c270f17e308605ebd199da0559ce5 [diff] | |
| parent | 0672ea446d2de2e862aee1f2cd957a907efd194e [diff] |
resolve merge conflicts of a578ae2 to stage-aosp-master am: cee0c941ed am: 0672ea446d Change-Id: I441ab7f8fd1fb71cc1bf38fe7450a0f9ecdccee0