tree 845d5cf30a037a7e3c83e66ef774a0cf4c7eef35
parent 5f3319f9406cfc62f93181513f65ea25e830c46e
parent 16a584a67aa43d2b0fe6453441326020f610965f
author Bill Yi <byi@google.com> 1481068406 +0000
committer android-build-merger <android-build-merger@google.com> 1481068406 +0000

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: ed9d1ca52d am: b80ef47305
am: 16a584a67a

Change-Id: Ib67cf630bc22230a14273c0133e5a84b3c9ffa1d