tree fb1fbc4a574e25f1c01cab438ce4c4227104c392
parent 17b1adca7cd06086383a511dd832b17edbfe6d45
parent dcf2e205bfcab6461db4680ce7ecd72ff03b4328
author Svet Ganov <svetoslavganov@google.com> 1467854704 +0000
committer android-build-merger <android-build-merger@google.com> 1467854704 +0000

Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
am: dcf2e205bf

Change-Id: I00b1a6aba01fd9155e4b0db17e9bd65d31425489