commit | 25d7952d0fe2987f126d60de6f2e007f2dd1d989 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 05 17:25:41 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 17:25:41 2013 -0800 |
tree | 9db0000b2e1982d564694bf9a02e794bd3c0823a | |
parent | dd99e748d81966523caadccab110f566d9e837f7 [diff] | |
parent | 05ac38084fee1be0610b3361a4ebcee115871b42 [diff] |
am 05ac3808: Merge commit \'d0ad8415a814466a3a46286914fa97d945f10c70\' into HEAD * commit '05ac38084fee1be0610b3361a4ebcee115871b42':