OSDN Git Service

am d5241d83: (-s ours) am c5151d2c: am b60bc0ec: resolved conflicts for merge of...
authorSebastien Hertz <shertz@google.com>
Thu, 27 Aug 2015 10:41:47 +0000 (10:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:41:47 +0000 (10:41 +0000)
commit69ee2b6b43de666162c998f935197fb0d00065c7
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent7b2e3129b2f4dc64ca30009ad292a6d491ceac0c
parentd5241d83fe357bb6bdeb61a507ef8e0af2949949
am d5241d83: (-s ours) am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

* commit 'd5241d83fe357bb6bdeb61a507ef8e0af2949949':