tree 2129ab6a12b16cc51a85c08a53a5571dc77102cf
parent 23a027d9117a6dfd37f6f7ea9265e651493523ed
parent eabaf266f8156fe95fe532a820320701296d02bd
author Android Build Merger (Role) <android-build-merger@google.com> 1467855202 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467855203 +0000

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