diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-08-07 15:14:24 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-07 15:14:24 -0700 |
commit | be2fbc8adb94a2bc79a7e73a4e54070c1a34385f (patch) | |
tree | 7a3f6a8b8b8808d3e4c0259db00a93306d16fde2 | |
parent | 45ac967b8529c7e0d15923b1b6cccc655d29566b (diff) | |
parent | 47fa7eefa8ce9a8345c21cf1c9bd3ece228a9586 (diff) | |
download | toro-be2fbc8adb94a2bc79a7e73a4e54070c1a34385f.tar.gz |
am 47fa7eef: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '47fa7eefa8ce9a8345c21cf1c9bd3ece228a9586':
0 files changed, 0 insertions, 0 deletions