commit | 35e85bdd9d6b2941358b6246b0f5d7afbb780534 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu May 16 05:48:13 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 05:48:13 2013 -0700 |
tree | 6f8bed986145700824b31d53a4dbc29752a967f3 | |
parent | 88249ced7878bcecead43fd4ac72d897993cc4fe [diff] | |
parent | c0e9713ace444e7627f44bbe3feb7c5ae479e834 [diff] |
am c0e9713a: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'c0e9713ace444e7627f44bbe3feb7c5ae479e834': (42 commits) JWR45B "JWR45" "JWR44B" "JWR44" "JWR43" JWR39D JWR39C JWR39B "JWR39" JWR38B "JWR38" "JWR37" JWR36C JWR36B "JWR36" JWR32E JWR32D JWR32C JWR32B "JWR32" ...