OSDN Git Service

am 6a37681b: am 557282db: am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally...
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:27:46 +0000 (23:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:27:46 +0000 (23:27 +0000)
commite8e4efda812fa5c1e5a92785c40c02969c84b0a1
treedb34eca2da5ec1662b262862fc44c323209fcb14
parentf0ed056ddc812a8269556bd26427e339932dbff0
parent6a37681b7bb4ef2eb85ca11b6d98b5936c259da3
am 6a37681b: am 557282db: am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."

* commit '6a37681b7bb4ef2eb85ca11b6d98b5936c259da3':