| commit | 80ef0250a234714f23bb8d740c451f54419bf02e | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:31:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:31:31 2015 +0000 |
| tree | 0fe003ba0d24a69430cffa048f11766abc81bc61 | |
| parent | d384df013d242a530f70bef052ccdf2406fe7d87 [diff] | |
| parent | 1e40ced5ff25ac2e74392d402b9e7cc0b44d556e [diff] |
am 1e40ced5: am 8b669c38: am e7cdef2b: am 2ccd3e06: am 46b2a3f2: am 6d5089b2: am 7f2984fc: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev * commit '1e40ced5ff25ac2e74392d402b9e7cc0b44d556e':