| commit | aa05ac49db5c2a50baafedb816a404428cf6c482 | [log] [tgz] |
|---|---|---|
| author | Chad Jones <chadj@google.com> | Fri Apr 19 20:55:19 2013 -0700 |
| committer | Chad Jones <chadj@google.com> | Fri Apr 19 20:55:19 2013 -0700 |
| tree | 7dc80625e562c1a77a117e8eefa2d48327c4e629 | |
| parent | b81dc8414a80fc1cbd809609f212702bda36f449 [diff] | |
| parent | f0df12ae6a652ae23d7176d11e4b872ff905aea1 [diff] |
Merge commit 'f0df12ae' into jb-mr2-dev-plus-aosp