OSDN Git Service

am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
authorYing Wang <wangying@google.com>
Wed, 26 Feb 2014 20:11:56 +0000 (20:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Feb 2014 20:11:56 +0000 (20:11 +0000)
commit332bbced6d075eccdf54b00d4178afc59db6f096
tree206fffec4e6b71be52015dc96f7144b35533e3be
parent64cd12187e28cf6eadd686fd6c661126d753e5d6
parenta8d273d3ce1d062c55dd936ab17792c7494643ca
am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."

* commit 'a8d273d3ce1d062c55dd936ab17792c7494643ca':
  Conditionally include the 'samplecode' rules.