summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-27 11:39:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-27 11:39:21 -0800
commite21cae3e519bd2f4e1228b8e1edf61c4773db579 (patch)
tree4b6893fbd91482a17379b93b57a4dc04b7841c67
parent8649dd2c5bf1f3ba74a93aa008c4fb74804ff3db (diff)
parent16f00894d5cc48d0814cc5d061e8373cbb514389 (diff)
downloadmedia-tools_r22.tar.gz
am 16f00894: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergetools_r22jb-mr1.1-dev-plus-aosp
* commit '16f00894d5cc48d0814cc5d061e8373cbb514389':
0 files changed, 0 insertions, 0 deletions