tree 26c988da40785375f5c2fc6d49f129bc0e6a10b2
parent 2b7e85a07e79c5c161b85912906a9f784071daab
parent e616ff7e8d752d6020538323622fa27ef5faea28
author Bill Yi <byi@google.com> 1440633604 +0000
committer android-build-merger <android-build-merger@google.com> 1440633604 +0000

am 0498d64e: (-s ours) Merge commit \'8b468ac192571e59592e0341af56b5bcf462400a\' into HEAD automerge: 2fec571
automerge: e616ff7

* commit 'e616ff7e8d752d6020538323622fa27ef5faea28':