OSDN Git Service

am 1d671c23: am 823f0ba6: (-s ours) am 0239220a: am 2f5de9f5: Merge "Bring main.mk...
authorNarayan Kamath <narayan@google.com>
Wed, 2 Apr 2014 11:08:59 +0000 (11:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Apr 2014 11:08:59 +0000 (11:08 +0000)
commit0919322dad6b7744c2698b21badc9596f9008153
tree5228d5089231a98ad178f836afa11cdb805a2557
parentfb5c7e58149f6ff585e9c24c21942410cd866814
parent1d671c236ab7018c2534f7a4e0a0c7fe62bf53b6
am 1d671c23: am 823f0ba6: (-s ours) am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with "

* commit '1d671c236ab7018c2534f7a4e0a0c7fe62bf53b6':
  Bring main.mk in sync with master.