tree 83671a4058e659112456c1a86beb094001569131
parent 96c1a8cf01fbc00b7c888d9ad1192509498a9b9d
parent 4d64f608c31a616419c38e786ea73992aefb046a
author Zach Jang <zachjang@google.com> 1449703151 +0000
committer android-build-merger <android-build-merger@google.com> 1449703151 +0000

DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063  -s ours am: db4d57a84c am: 02115bf55a am: 4c51cd1a9b am: 3a68198b39
am: 4d64f608c3

* commit '4d64f608c31a616419c38e786ea73992aefb046a':
  DO NOT MERGE - Update security string to 2016-02-01