| commit | 8705eb95b0e00d54bbc511351c6bb180bf3273de | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 11 13:31:17 2014 -0700 |
| committer | Geoff Mendal <mendal@google.com> | Mon Aug 11 13:31:17 2014 -0700 |
| tree | 7c847360ac3e2710b767db0a03989d0064f68e2b | |
| parent | 3f19789b7703695531b954cce9d8d65760ab1835 [diff] | |
| parent | d42a5fd3e7fff38dbc8a82484dac53bfbcb61ac4 [diff] |
Merge branch 'lmp-dev' of sso://googleplex-android.git.corp.google.com/platform/frameworks/base into lmp-dev