| commit | 7630837d1c1f4b7c1809e0a152bf8f9331b5df07 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Tue May 24 01:39:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 24 01:39:50 2016 +0000 |
| tree | 28947e87d8963a29d299059a6e927121015adb29 | |
| parent | 03b6aa0720220d65c856f3b7dc0eedc1adad8d10 [diff] | |
| parent | a1fc2bf6cd764d44d5a56e6ba15f8ca4a27b11d4 [diff] |
Merge "DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5 -s ours am: e495d379de -s ours am: 8b961c808b am: 3cba9b15f7 am: 8ebaeae1f6 -s ours am: 9ae8c7356e am: bc60af7bfd am: 37e618fef8 am: c3d3f6bad9 -s ours am: 2af23a3c20 am: 97794d9cbd" into nyc-mr1-dev-plus-aosp am: a1fc2bf6cd -s ours * commit 'a1fc2bf6cd764d44d5a56e6ba15f8ca4a27b11d4': Change-Id: I33794ffa3f9544eb3e285b97b0317af59a34750b