OSDN Git Service

am c667f054: am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration...
authorCraig Mautner <cmautner@google.com>
Thu, 6 Feb 2014 22:17:28 +0000 (14:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Feb 2014 22:17:28 +0000 (14:17 -0800)
commitec8ac306147e8f8f4a225371f9d22c2fe89e1c71
tree87944b794fdda475fec8911ef1791120de9038e6
parentef129d8442efd4a95d18d9febcbd4feaf61fb255
parentc667f054d5b5a87247cd84d78d483dc1c97af41a
am c667f054: am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.

* commit 'c667f054d5b5a87247cd84d78d483dc1c97af41a':
  DO NOT MERGE. Test for Configuration differences before changing.