Manual merge of a8aec64
authorPyry Haulos <phaulos@google.com>
Tue, 12 Apr 2016 00:53:05 +0000 (00:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Apr 2016 00:53:05 +0000 (00:53 +0000)
commit0bde1254b259a1ce5f6cdce67a4be88ba80e2502
tree9caa5583420877d889331ad8656f942028a00a4a
parentdf2118cc57f56f2f2e1221a6065c8040d51a75b4
parent9d8b0091b3fbbcc041631bbb67445ac7472bb7d8
Manual merge of a8aec64
am: 9d8b009

* commit '9d8b0091b3fbbcc041631bbb67445ac7472bb7d8':
  Manual merge of a8aec64

Change-Id: Ia56fab0e22e4ef7b0d0dab5f22c3238949d66bf3