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)
commit7f25a1d27cb917375ba2e54b55beb170d358a3e1
tree9caa5583420877d889331ad8656f942028a00a4a
parent0ad9914e30c3fc0bb865bdbd599c2ba3914b9caa
parent0bde1254b259a1ce5f6cdce67a4be88ba80e2502
Manual merge of a8aec64 am: 9d8b009
am: 0bde125

* commit '0bde1254b259a1ce5f6cdce67a4be88ba80e2502':
  Manual merge of a8aec64

Change-Id: I3032f7538ecacc928ed3572e7b557f755737e762