OSDN Git Service

am a480cf93: resolved conflicts for merge of cfe535ef to stage-aosp-master
authorElliott Hughes <enh@google.com>
Fri, 2 Mar 2012 18:47:23 +0000 (10:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 Mar 2012 18:47:23 +0000 (10:47 -0800)
commita2b1bbc9a605819eb5ecd1df61d4f2a79f1a8f92
treecaa4710856a2f74c9eed75f13f3ddc10e432a600
parentcff86bdc02f70bb5758234ace75a2f84a626cc3c
parenta480cf930f31ab404e7efe66259427a53d72fa2b
am a480cf93: resolved conflicts for merge of cfe535ef to stage-aosp-master

* commit 'a480cf930f31ab404e7efe66259427a53d72fa2b':
  Upgrade to tzdata2011a.