commit | 783c166ae6f578972ce5f60ccdc8d281901638b3 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Jul 21 22:31:22 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 21 22:31:22 2016 +0000 |
tree | 7f49e4bc77afaf6d4de54a0cce83635ccd7ffcda | |
parent | d3c96cea7725faa318bfae9d2054a30b7db24333 [diff] | |
parent | 17f8bff8b0676e18dc58f501ade6a75f84c3b691 [diff] |
Merge \"Update instructions for merging upstream changes.\" am: 17f8bff8b0 Change-Id: Iebd2e35ef94dca045e3e4d325695d624a4392b24