tree a25fc499aa8015b8247b088ca5acd448010d968b
parent 44bcb759266a6db0df25f4f9105a094c46f02b8b
parent 0a649bffccd5a25b084a1b564c6057bca891b0d0
author Peter Qiu <zqiu@google.com> 1485471193 +0000
committer android-build-merger <android-build-merger@google.com> 1485471193 +0000

Merge changes If5025361,Iabe27cd8
am: 0a649bffcc

Change-Id: Ia66d523ed565704178315d66bd19ffe02cbb7560