am 2a1a308f: (-s ours) am 70a4a6a3: Merge "changing the rules following java...
am 2a1a308f: (-s ours) am 70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."
* commit '2a1a308f':
changing the rules following java package renaming for external/apache-harmony.