OSDN Git Service

am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp
authorEric Laurent <elaurent@google.com>
Sat, 17 Mar 2012 00:26:15 +0000 (17:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 17 Mar 2012 00:26:15 +0000 (17:26 -0700)
commitc7c8375bad086263ca1e14d08e03a69e4a3b1651
tree8ec033794cd34cfcf513f4bf6b50754c73bf881f
parente341547e2931b4aae4681053491ba5ccbab06e6f
parent9c450b31c18d0995ded7aae7552a0db36654c62e
am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp

* commit 'b388138ff2986d6883fa9331fa91ae5e18ae81a0':