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)
commitb0bc49a4faeb9604e2f45892c8c774156122caea
tree0d56177d1f4835610c4b14fd0b6634c4c9674bb2
parent6e9528b2e263c67d53edf3b5262411c4790be424
parente27415946905ebd48a3a3bd19b00de571b4fd39a
am 614d3650: resolved conflicts for merge of f959df75 to jb-mr2-dev-plus-aosp

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