OSDN Git Service

am 6c337e7a: resolved conflicts for merge of bfb2aa46 to jb-mr2-dev
authorJean-Baptiste Queru <jbq@google.com>
Thu, 7 Mar 2013 20:14:05 +0000 (20:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Mar 2013 20:14:05 +0000 (20:14 +0000)
commitf092d1188ee150cc3a1427a1ac57e0b5aa0d8b6b
tree6ff7dc38de93972a9c261d1ba57d27a3145beef5
parentd56f8effd65a0aefcca2f7f685b85b3deeed7090
parent6c337e7a663c1049e58e0051bd7bfba61614ef37
am 6c337e7a: resolved conflicts for merge of bfb2aa46 to jb-mr2-dev

* commit '6c337e7a663c1049e58e0051bd7bfba61614ef37':
  Tweaks for forward compatibility