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