OSDN Git Service

am 57c33d0d: am dbccd44a: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca696443...
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 23 Nov 2013 03:31:23 +0000 (19:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 23 Nov 2013 03:31:23 +0000 (19:31 -0800)
commit9318944dd19ff5db04c286f869a8f130d3e305f9
treee20b2ea4a7f30b15bd590020553e5a625dc8ea09
parentb0fa90c9b45302422a7bb1a13696c9c463c887cd
parent57c33d0d71251d408cf771e5fa861fb1cdecf5f9
am 57c33d0d: am dbccd44a: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD

* commit '57c33d0d71251d408cf771e5fa861fb1cdecf5f9':