OSDN Git Service

DO NOT MERGE fix am error for 1dffda3b
authorScott James Remnant <keybuk@google.com>
Tue, 20 Oct 2015 02:22:44 +0000 (02:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 02:22:44 +0000 (02:22 +0000)
am: f9e2fe4b33  -s ours

* commit 'f9e2fe4b3307c70cae1a06b0736d9483b284d4a3':
  DO NOT MERGE fix am error for 1dffda3b


Trivial merge