commit | 8a828b5cd19082beb0d2760d8cb2ced51f6021c8 | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Thu Apr 13 19:08:26 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 19:08:26 2017 +0000 |
tree | 3a1a92d345eda46cbbe47166242f2181f453b213 | |
parent | bd3fe90ae6c852fcab7c44842f12877bcd2691d7 [diff] | |
parent | a6fc53fc15efcb5e8b304f64b1bd823861c92c10 [diff] |
Merge "Merge "DO NOT MERGE: Updating CTS Security Patch to 2017-04" into marshmallow-cts-dev am: 8553cc030f -s ours" into nougat-cts-dev am: 6754facde4 -s ours am: 54d3d82d20 am: fecb49089b am: c99b9418c4 am: a3f6d35d88 am: a6fc53fc15 -s ours Change-Id: Ib313044f87323b1eb023a0bbbb0c3eead999fa82