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