commit | b02e60db28cc7fd6c2c8af23c54045101973b71b | [log] [tgz] |
---|---|---|
author | Joshua Schwarz <joshuaschwarz@google.com> | Tue Apr 25 20:31:09 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Apr 25 20:31:09 2017 +0000 |
tree | b30ebda201e604a0824f0bcbd2a1f320885fc340 | |
parent | 92d33c30215515b344f056381eb5c1a4ff687573 [diff] | |
parent | f54d7f5cea841771972477a94d56e14c58e22066 [diff] |
Merge "Merge "Revert "Advancing our amazing bet on PINs." DO NOT MERGE" into nougat-mr1-cts-dev am: d9e0e76909 -s ours" am: eb6e330495 -s ours am: 51305d6bc1 -s ours am: f54d7f5cea -s ours Change-Id: Ib64a624c0ad3e9c1db3d622f9e27949f3a088eb9