tree c6af6b470cf1e39b30232c3f962c0af584514300
parent 860435c4ffa92bdba854c7f82fca61bffbe07b74
parent 6cd92f57ee71cc36276803807809d0014259b51a
author wangqi <wangqi@google.com> 1504796542 +0000
committer android-build-merger <android-build-merger@google.com> 1504796542 +0000

Merge changes I0e8549cf,I12ac7b89,I2c77f0c6,I3ba5795b
am: 6cd92f57ee

Change-Id: I43e12b72833dca1066ede3dcfff946f210d41d85