commit | f4299a3461c98008688c64f8864ef73218a84714 | [log] [tgz] |
---|---|---|
author | Holly Jiuyu Sun <jiuyu@google.com> | Thu Dec 14 22:56:38 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 14 22:56:38 2017 +0000 |
tree | 2304e922f5f42e0d49fd492094a0ede615a76cb2 | |
parent | a233c9502643058cbdd276243018e822bcb683e1 [diff] | |
parent | 5ad2fbabf846da36a340eea0afa0d5369852fb73 [diff] |
Merge "Confirmation code second try." am: df0f5e9791 am: cdc3c3ec77 am: 5ad2fbabf8 -s ours Change-Id: I806e1dc1a2fa399db4578f6b5919dec70a313f7d