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)
am: c6f9dd4de1

Change-Id: I3246a5584d8c7f5cab32ba2bf6a42eb2e3201b79


Trivial merge