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