commit | b931a5e335f5591ed4648949ca401038d3c42c9e | [log] [tgz] |
---|---|---|
author | Tina Zhou <tinazh@google.com> | Thu Mar 16 23:22:59 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 23:22:59 2017 +0000 |
tree | 4ac2678c2aa18b8381f8429defee7af000236619 | |
parent | 9789dda7ba3f23984fa9a4e01ab901c8d64450fd [diff] | |
parent | b59d627de81859b0ab7d29315d8ebc43f3f9cecf [diff] |
Merge "DO NOT MERGE: Updating CTS Security Patch to 2017-03" into marshmallow-cts-dev am: 4d87717744 -s ours am: b2c68e90e0 am: e5d7c64361 am: 4b7b417cfe am: b59d627de8 -s ours Change-Id: I456e2577fab2d16bd3d9355d2a8da03317aaa693