Merge goog/master@c8da37c into stage-aosp-master. am: 38365a1634 am: e1fb5fe7df am...
authorMika Isojrvi <misojarvi@google.com>
Mon, 25 Jul 2016 20:47:59 +0000 (20:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:47:59 +0000 (20:47 +0000)
am: 061e03a696

Change-Id: Ic5f0b749913102cbb7b69851568ebfce7ca5cdcf


Trivial merge