| commit | 21db9b92ba2d8019e1fcbe8a054ca79ceff5a880 | [log] [tgz] |
|---|---|---|
| author | keunyoung <keunyoung@google.com> | Mon Apr 01 10:32:03 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 01 10:32:03 2013 -0700 |
| tree | d2d8d12700b56526ed1b4fe286dcac49631a1d9d | |
| parent | d9aef8ccc3b3e345afa6dd307cedb92b37498a83 [diff] | |
| parent | d1d6cea15ea80e86f562b9174ea5bfa39d30fa97 [diff] |
am d1d6cea1: (-s ours) am da7c58ec: am 5158006b: am d4fa235e: Merge "version up to R4" into jb-mr1.1-dev * commit 'd1d6cea15ea80e86f562b9174ea5bfa39d30fa97': version up to R4