| commit | 570141e04f70e942f9fe839a47ca2a089fcfeaac | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Tue Aug 31 15:29:24 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 31 15:29:24 2010 -0700 |
| tree | 5e221092fc72811b07297d13a0c13f376d68b519 | |
| parent | db466cbe5b12df28ba54e95ce733a0f8d12981bf [diff] | |
| parent | 00800b0be6925b45165bc75f636048016d62e756 [diff] |
am 1e1a030b: am 47471175: Can\'t have two rules building the stubs and public.xml! Merge commit '1e1a030b502acae11dbd11d826d389351910a60f' * commit '1e1a030b502acae11dbd11d826d389351910a60f': Can't have two rules building the stubs and public.xml!