diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-01-26 14:12:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 14:12:47 -0800 |
| commit | b8cedf7bc99ad52d739949ea1af1184b489c04da (patch) | |
| tree | 4d5bc35d5457c089aceda2ca91e84d015aa50541 | |
| parent | 323c16039005ccc150804d30db3fad22c19c4117 (diff) | |
| parent | 39c0d4c031d479a679900cb540253f42747cb810 (diff) | |
| download | msm7k-b8cedf7bc99ad52d739949ea1af1184b489c04da.tar.gz | |
am 39c0d4c0: (-s ours) do not merge bug 3370834 Cherrypick from master CL 79327
* commit '39c0d4c031d479a679900cb540253f42747cb810':
do not merge bug 3370834 Cherrypick from master CL 79327
0 files changed, 0 insertions, 0 deletions