tree c2634f87e9d4af287a90e547cb5f34f09f19ac7e
parent d17a0c0ae9eeb072d75b4b0497de2b8c6e1ed10a
parent e925d12d620ee0821d1fc214a94e062f6a8131be
author Ta-wei Yen <twyen@google.com> 1479773584 +0000
committer android-build-merger <android-build-merger@google.com> 1479773584 +0000

Merge commit '4ce8956d8836b664aa844ead396f5952c2098ae9' into manual_merge_4ce8956 am: 3c5f84bbde
am: e925d12d62

Change-Id: Iab38aa724b7aa1a8d8f135b648581e7da30e7b0d