Manual merge of a8aec64 am: 9d8b009
authorPyry Haulos <phaulos@google.com>
Tue, 12 Apr 2016 00:58:11 +0000 (00:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Apr 2016 00:58:11 +0000 (00:58 +0000)
am: 0bde125

* commit '0bde1254b259a1ce5f6cdce67a4be88ba80e2502':
  Manual merge of a8aec64

Change-Id: I3032f7538ecacc928ed3572e7b557f755737e762


Trivial merge