| commit | 2487ab9f58032da240301964d065d4490a16fc99 | [log] [tgz] |
|---|---|---|
| author | Jin Cao <jinyan@google.com> | Sun Nov 02 20:51:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 20:51:42 2014 +0000 |
| tree | 1a28c321daa0cc8218769905f759d86f0e9c6aaa | |
| parent | cf3eb7fe42fa0b5e35c36686724e3319af41744c [diff] | |
| parent | 05e3669c3ee048637808a952d123d21a53c4c673 [diff] |
am 05e3669c: am 18284ee7: am eed6fd03: am 9d96c776: am 20c3e580: Merge "Combine conv and misc panes into one frame and animate that instead" into ub-gmail-ur14-dev * commit '05e3669c3ee048637808a952d123d21a53c4c673': Combine conv and misc panes into one frame and animate that instead