OSDN Git Service

am 614d3650: resolved conflicts for merge of f959df75 to jb-mr2-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Tue, 7 May 2013 17:01:06 +0000 (10:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 May 2013 17:01:06 +0000 (10:01 -0700)
commit5c56b57b69a73f4af4d8c0cf62efdf1416428a01
tree0d56177d1f4835610c4b14fd0b6634c4c9674bb2
parent7284c0082c82b9f4c7277427299b22a869fe66f1
parent614d365088a1959ad44831fa9b1065ecbd4eefb8
am 614d3650: resolved conflicts for merge of f959df75 to jb-mr2-dev-plus-aosp

* commit '614d365088a1959ad44831fa9b1065ecbd4eefb8':
  Someone's IDE chose the wrong Date.