tree 79c190ed1f52ac3f2fd513675beedcc58720d70e
parent 7686e260715087de8c24f1c9b47d6bb12730137c
parent 3b050732e0e579697434c77b655a15060a26a1b2
author Xin Li <delphij@google.com> 1510709416 +0000
committer android-build-merger <android-build-merger@google.com> 1510709416 +0000

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 3b050732e0

Change-Id: I1b582b63e61f260aa0bf238703c396a65dc9bfa0