Merge commit \'f85d6cd8045ce933dfdc19bc888228cd9382e48c\' into HEAD

am: 1ec36aaeb0

* commit '1ec36aaeb02a97a287eb0467b9b2fc9eea38a15c':
This commit is contained in:
Bill Yi 2015-11-03 23:34:12 +00:00 committed by android-build-merger
commit f685f33a21

Diff content is not available