commit | d5de980a7a1dcb96fa1108f0be35652715cbc231 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Jan 13 18:16:23 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 13 18:16:23 2017 +0000 |
tree | aee1888414fc424a40588309b33470cd983fc5c8 | |
parent | 43c9408dc05313a89b5ba4f919185a2b1c772ef4 [diff] | |
parent | 6aa0b0565f7b669a20f74df5cd8153fbe16370ad [diff] |
Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf -s ours am: bb26711fdd am: 6aa0b0565f Change-Id: Ie424175ac5296feb654ac7e17620249e41411bf7