| commit | d4ed4363101201ed24795f50064fe76cb754f979 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 14:31:23 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 14:31:23 2013 -0800 |
| tree | a71272550670a5c14c1051d27945f862b19c4ff4 | |
| parent | f809e96fef4df25899c267e1cac648e08ba31a72 [diff] | |
| parent | 909960ad924687dfa3946cd6a077701968649af0 [diff] |
am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge * commit '909960ad924687dfa3946cd6a077701968649af0':