OSDN Git Service

am c8fea2ae: am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp...
authorXavier Ducrohet <xav@google.com>
Wed, 26 Mar 2014 18:23:15 +0000 (18:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Mar 2014 18:23:15 +0000 (18:23 +0000)
* commit 'c8fea2ae9859c68e3d48c4e65ada7331daab11f0':
  Add annotation support lib.

1  2 
core/pathmap.mk

diff --cc core/pathmap.mk
Simple merge