| commit | 5ff7efa253486b2b482031ab9a3714fc5cc10f7f | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Tue May 15 14:54:00 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 15 14:54:00 2012 -0700 |
| tree | 5e71ad9ccd4425f7f9235014443f6824411429f3 | |
| parent | 6387c8a9cb52e6b7bb1a0fb40ee3b66c00ad6697 [diff] | |
| parent | a60314c70762b99a7ebc40547480ce351c3b5c23 [diff] |
Merge "Appease the simians" into jb-dev