OSDN Git Service

am 6d1276b6: am f132da6b: am df0c90d0: am ce418783: am a660d06e: am 1cda15d3: Merge...
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:28:43 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:43 +0000 (23:28 +0000)
commitfdd506be61a86d4a0d6a79c91deccf760584cb29
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent6e3daddb854d7194332c7df7aba49864d2f41bcc
parent6d1276b60bff668e24419f4a77e90a597de471d5
am 6d1276b6: am f132da6b: am df0c90d0: am ce418783: am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"

* commit '6d1276b60bff668e24419f4a77e90a597de471d5':