tree 6cabcb2332f974ebbeebee81411ae72edfc243a3
parent af8ae72bac97911072389954a2612316583b16a3
parent ada7fd31a17f779d99662b70ed3b62dc141289bf
author Xin Li <delphij@google.com> 1510712103 +0000
committer android-build-merger <android-build-merger@google.com> 1510712103 +0000

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

Change-Id: Ia4700d6642192bf0dea5481ac4787b0fb0b8e234