summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-07 06:34:29 -0700
committerThe Android Automerger <android-build@android.com>2012-08-07 06:34:29 -0700
commitd02212da42cb4519cac56547213f72464bb2f44b (patch)
tree638d97d8374ad43338d8ccf7b41c9a3e50bffe98
parent14bd369e4b711bfb267279c2161358542ed75b29 (diff)
parent348b71e295738457bc51e86917e200e44318b57f (diff)
downloadframeworks_native-d02212da42cb4519cac56547213f72464bb2f44b.zip
frameworks_native-d02212da42cb4519cac56547213f72464bb2f44b.tar.gz
frameworks_native-d02212da42cb4519cac56547213f72464bb2f44b.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions