commit | 0baade6562dabf1d42eb5e83949c7a06eae75172 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 18:06:07 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 12 18:06:07 2013 -0700 |
tree | ea6df94cb074bf3aec18f7812cc25b2f12ef9db4 | |
parent | 951e0f1e8d2530c4cfe4ed71f8f62f1e875912ea [diff] | |
parent | d8ef19b0c8a57daea726ad93edbbe396b9e9f5d3 [diff] |
am d8ef19b0: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'd8ef19b0c8a57daea726ad93edbbe396b9e9f5d3': JWR66J JWR66I