OSDN Git Service

am 21f1d958: am 2a1a308f: (-s ours) am 70a4a6a3: Merge "changing the rules following...
authorNarayan Kamath <narayan@google.com>
Fri, 21 Feb 2014 18:35:23 +0000 (10:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:35:23 +0000 (10:35 -0800)
commit1886cb5cb0c0d6ad3467fc769d302fadc902d82f
tree48be2ec2fb9f9a7375f47f2d7c53e83d7ff5dff2
parent6f980d4960009f0bd4002abe1b84e9e7efeddab1
parent21f1d95870467a8ec2fc2be274f16eba6daa82df
am 21f1d958: am 2a1a308f: (-s ours) am 70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."

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