OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4b20d7 b30f6eb)
am b30f6eb0: am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev
authorElliott Hughes <enh@google.com>
Fri, 13 Sep 2013 17:53:43 +0000 (10:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Sep 2013 17:53:43 +0000 (10:53 -0700)
* commit 'b30f6eb026db05c969afacc758e529e73f0e314d':
  Upgrade pre-jb-mr2 releases to tzdata2013d.


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help