Merge goog/master@c8da37c into stage-aosp-master. am: 38365a1634 am: e1fb5fe7df am...
authorXin Li <delphij@google.com>
Mon, 25 Jul 2016 20:50:29 +0000 (20:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:50:29 +0000 (20:50 +0000)
commit90ff3617d526daf1b46bbd978f61fa01a51fa6c5
tree323977010fc891f8ff6137e29543466ca7c674f2
parent0a874f4a2cb1024d43d6d8ccc39e484fc45138fb
parentc6f9dd4de18067a310f1290e6321f906315ceb3c
Merge goog/master@c8da37c into stage-aosp- am: 38365a1634 am: e1fb5fe7df am: 82d89acd57 am: dd0641f583 am: 061e03a696
am: c6f9dd4de1

Change-Id: I3246a5584d8c7f5cab32ba2bf6a42eb2e3201b79