OSDN Git Service

am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode...
authorYing Wang <wangying@google.com>
Wed, 26 Feb 2014 20:15:01 +0000 (20:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Feb 2014 20:15:01 +0000 (20:15 +0000)
commit557282dbc4db5bf2023c2e69a58a6f0d326280e2
tree5695efed8419dd3103c31d2bfbe6387abc0bf114
parent62e30dcf8bcc6318ac9691cfe63f94a76abf1b01
parent332bbced6d075eccdf54b00d4178afc59db6f096
am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."

* commit '332bbced6d075eccdf54b00d4178afc59db6f096':
  Conditionally include the 'samplecode' rules.
core/main.mk