OSDN Git Service

am 79181fca: (-s ours) am 1a85d0f7: am a4bd2cbe: am 10226c2a: am c702fa97: am 9182e5f...
authorDavid Friedman <dmail@google.com>
Tue, 4 Mar 2014 08:25:34 +0000 (08:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Mar 2014 08:25:34 +0000 (08:25 +0000)
commit210451262a2ed86c9540bd2ea2a8474374a8efb9
tree7ba4afaeb6512e99b06a35ef2d9a036628d1eca0
parentafe2f2a65df89c590476b5a338922c45d572a186
parent79181fca6973161ff5e492fff7ecc114d9ea1fb0
am 79181fca: (-s ours) am 1a85d0f7: am a4bd2cbe: am 10226c2a: am c702fa97: am 9182e5f8: DO NOT MERGE

* commit '79181fca6973161ff5e492fff7ecc114d9ea1fb0':
  DO NOT MERGE