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)
commit2e3d614b2ebb46d6aa6530e4c2feb0b43de498d3
tree99840545842f9539d09ce75c57f47bd7c20588ba
parent4758b7bc67f9a87d086d4eb9c195bba95de9756e
parentf9e2fe4b3307c70cae1a06b0736d9483b284d4a3
DO NOT MERGE fix am error for 1dffda3b
am: f9e2fe4b33  -s ours

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