OSDN Git Service

am 2c2a1ec4: am 096e5b73: (-s ours) DO NOT MERGE - Reverting accidentally merged...
authorSascha Haeberling <haeberling@google.com>
Sat, 16 Aug 2014 02:09:00 +0000 (02:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 16 Aug 2014 02:09:00 +0000 (02:09 +0000)
commit9df3a83e669584002c28cad024f53e204829a501
tree3e05217ba731c3644856941f9d9fedfa31537374
parent9b00e62cefc04649e50e7ffc62f7ed85a02c5829
parent2c2a1ec4f1e1182cd4c66a053a93315549f06d5e
am 2c2a1ec4: am 096e5b73: (-s ours) DO NOT MERGE - Reverting accidentally merged 524943 into glacier.

* commit '2c2a1ec4f1e1182cd4c66a053a93315549f06d5e':
  DO NOT MERGE - Reverting accidentally merged 524943 into glacier.