Merge goog/master@c8da37c into stage-aosp-master. am: 38365a1634 am: e1fb5fe7df am...
authorXin Li <delphij@google.com>
Mon, 25 Jul 2016 20:45:01 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:45:01 +0000 (20:45 +0000)
am: dd0641f583

Change-Id: I8e6184bcac57d5043e35da41d160c042cd966e27


Trivial merge