OSDN Git Service

am 557282db: am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include...
authorYing Wang <wangying@google.com>
Wed, 26 Feb 2014 20:18:04 +0000 (12:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Feb 2014 20:18:04 +0000 (12:18 -0800)
commit6a37681b7bb4ef2eb85ca11b6d98b5936c259da3
treea928c40fe31583eb53ccf6117b5d2dd921c7564e
parent0d9bb26c88e56057979da07a4ffb55eb6f8cafb6
parent557282dbc4db5bf2023c2e69a58a6f0d326280e2
am 557282db: am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."

* commit '557282dbc4db5bf2023c2e69a58a6f0d326280e2':
  Conditionally include the 'samplecode' rules.