OSDN Git Service

am 823f0ba6: (-s ours) am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with...
authorNarayan Kamath <narayan@google.com>
Wed, 2 Apr 2014 11:05:22 +0000 (11:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Apr 2014 11:05:22 +0000 (11:05 +0000)
commit1d671c236ab7018c2534f7a4e0a0c7fe62bf53b6
tree2f1042217f428448443073123e389bc9ecb04727
parent108df578615bac826cb57ffc80ce7c94bcc534f0
parent823f0ba6b8b52566d453d4770ac4e09f89b90842
am 823f0ba6: (-s ours) am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with "

* commit '823f0ba6b8b52566d453d4770ac4e09f89b90842':
  Bring main.mk in sync with master.