tree 9ec3b7d9c312c063f4c09b9723564e8751791e11
parent 14735f23490aba9e4d4f6c5ea6d7986103320701
parent 83bf2811204f17eb0771cf25750f4729d280d516
author Xin Li <delphij@google.com> 1510085159 +0000
committer android-build-merger <android-build-merger@google.com> 1510085159 +0000

Merge commit '6e6df26ed3086f6e208abfcd2bba5242f67ac78a' from oc-mr1-dev-plus-aosp into stage-aosp-master.
am: 83bf281120

Change-Id: I7ede7bb8da2996df1edd9cb45b178af024c8ceb4