| commit | bfef13e9d521fce9697e8a172c99378792c67a6d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Mar 07 20:16:52 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 07 20:16:52 2013 +0000 |
| tree | ac5b59d3bfbe34238d9bfccfb0b6b256428bbab3 | |
| parent | 8e70480c2e23aa85e9231a0ed1eef117cb5ac00c [diff] | |
| parent | f092d1188ee150cc3a1427a1ac57e0b5aa0d8b6b [diff] |
am f092d118: am 6c337e7a: resolved conflicts for merge of bfb2aa46 to jb-mr2-dev * commit 'f092d1188ee150cc3a1427a1ac57e0b5aa0d8b6b': Tweaks for forward compatibility