summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-12-09 14:57:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-09 14:57:37 -0800
commit13805ae9595e0e85a98632439abfaf2893630338 (patch)
tree3b28bb8c008ded5fc280ae23d4e5943b1dc10ce6
parent4367b4ad61be4c20174678a7ed481e480142710b (diff)
parent336658c321a6f15f121514342b0a508d84b4b415 (diff)
downloadsystem_core-13805ae9595e0e85a98632439abfaf2893630338.zip
system_core-13805ae9595e0e85a98632439abfaf2893630338.tar.gz
system_core-13805ae9595e0e85a98632439abfaf2893630338.tar.bz2
am 336658c3: Reconcile with ics-mr1-release
* commit '336658c321a6f15f121514342b0a508d84b4b415':
0 files changed, 0 insertions, 0 deletions