| commit | 5a6a42817d4b6d82f1b00c324e37a183fb70ab30 | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Thu Apr 28 11:49:43 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 28 11:49:43 2011 -0700 |
| tree | e3c1b87abb1fc891f184d11c3d4c1b0cf2e036f0 | |
| parent | d17d7f5a4e50e7dcdfab35958e576c27366c1a26 [diff] | |
| parent | a60594cb1c1399f557a82403f7fc7abb7af55250 [diff] |
am a60594cb: Fixed bad merge in ViewRoot.java. * commit 'a60594cb1c1399f557a82403f7fc7abb7af55250': Fixed bad merge in ViewRoot.java.