OSDN Git Service

am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences...
authorCraig Mautner <cmautner@google.com>
Thu, 6 Feb 2014 20:36:56 +0000 (20:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Feb 2014 20:36:56 +0000 (20:36 +0000)
commitc667f054d5b5a87247cd84d78d483dc1c97af41a
treed54ae7b3b0cf592693eb923b509ed1fa1e97f406
parent393fdbec9f3f11d277e1631c2e36362e408cbbdc
parent43ef013cbd769533737135af5a338898cc619602
am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.

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