| commit | ba30a0474f1665d2e0bca5cdc61e04c5d38f095c | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Thu Dec 01 00:24:39 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 01 00:24:39 2016 +0000 |
| tree | 9482973e61e232566b2ed2fb96112535086ca89b | |
| parent | afe748cd46075f7bf3f1f8253ad637bd7dac4170 [diff] | |
| parent | a4b4e731d18d92ff0f267cf8c17632679b007e11 [diff] |
resolve merge conflicts of a578ae2 to stage-aosp-master am: cee0c941ed am: 0672ea446d am: a4b4e731d1 -s ours Change-Id: I8aacdf62e8178fb21556d84fffabddfc428e59f1