| commit | 61dd02546d1c195ddc891f3b6f9da85ec4e3d07a | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Fri Jan 30 19:34:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 30 19:34:13 2015 +0000 |
| tree | c7d3d48b425b7c0fcab92d7ce021ab7f5184f8a1 | |
| parent | 1119ebf8dc97296e6e6c012ed46a5c2074114cef [diff] | |
| parent | 3ff3a50e5057fe904c3fe9df292de3a6111fe8ec [diff] |
am 3ff3a50e: Merge "Nested scrolling: android-support-v4 edition" into lmp-mr1-ub-dev * commit '3ff3a50e5057fe904c3fe9df292de3a6111fe8ec': Nested scrolling: android-support-v4 edition