commit | 4606449a53c1a802ea9db0059c08c95cb020376d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:13:22 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 21 16:13:22 2012 -0700 |
tree | 6213b78049605d83cf73f53ea202314163cedb94 | |
parent | b3f83098ef369e7c6d5a78bf74bef315ebd149c5 [diff] | |
parent | 9c6df3cdcc938302ba3176f56ec9b19c2d226227 [diff] |
am 9c6df3cd: (-s ours) Reconcile with jb-release - do not merge * commit '9c6df3cdcc938302ba3176f56ec9b19c2d226227': JRO03S