OSDN Git Service

am 2a1a308f: (-s ours) am 70a4a6a3: Merge "changing the rules following java package...
authorNarayan Kamath <narayan@google.com>
Mon, 17 Feb 2014 13:10:31 +0000 (13:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Feb 2014 13:10:31 +0000 (13:10 +0000)
commit21f1d95870467a8ec2fc2be274f16eba6daa82df
treec919f630dda6ed7fd6e43c6cef1cd9e6f2faa53f
parent7ad6f5f76bf1dc61145bc67e7c62046b96e59280
parent2a1a308f3bb3f9559461380eb04bfaa0a5554c32
am 2a1a308f: (-s ours) am 70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."

* commit '2a1a308f3bb3f9559461380eb04bfaa0a5554c32':
  changing the rules following java package renaming for external/apache-harmony.