| commit | 21f1d95870467a8ec2fc2be274f16eba6daa82df | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Feb 17 13:10:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 17 13:10:31 2014 +0000 |
| tree | c919f630dda6ed7fd6e43c6cef1cd9e6f2faa53f | |
| parent | 7ad6f5f76bf1dc61145bc67e7c62046b96e59280 [diff] | |
| parent | 2a1a308f3bb3f9559461380eb04bfaa0a5554c32 [diff] |
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.