commit | 16d6924b5529e424bd6db92c943d25461bb84b3f | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Dec 28 22:10:27 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Dec 28 22:10:27 2016 +0000 |
tree | d809c9afdcd534248bb2def80ff55780a481140b | |
parent | 1d5cad7eb970c552f802c97cb8c92820b9f07014 [diff] | |
parent | 8689fc01eee84afee36bfe1ab8bf456b50ded522 [diff] |
DO NOT MERGE: Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which was lost as a result of merge b70b7f8235ef38575467b6bb702be29e9d1024c7: am: 8689fc01ee Change-Id: I8a62fada35c0deae5b47c3c9726fa4dc687859b7