| commit | 619e5c8ecc4e217cd92a7c9692116d0017ddadca | [log] [tgz] |
|---|---|---|
| author | fionaxu <fionaxu@google.com> | Wed Sep 06 22:57:32 2017 -0700 |
| committer | Chen Xu <fionaxu@google.com> | Thu Sep 07 07:01:12 2017 +0000 |
| tree | 912d51124e5e606ef87e9951d1664f996b6531d6 | |
| parent | a15992086c63c38cb61ed23af8c5507d413c4776 [diff] | |
| parent | 6c7ef2e8d7538e8d9b38e724cffd5cf81c7dad10 [diff] |
resolve merge conflicts of 6c7ef2e8d753 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e Change-Id: I6a3488f21412b17e9a6bb453bd4137abab3ae205