| commit | 495f0c27a5afa48033c221a46ea29f6fb9dbffb0 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Tue May 15 20:24:51 2012 -0700 |
| committer | Raphael Moll <raphael@google.com> | Tue May 15 20:24:51 2012 -0700 |
| tree | 5d02f920a271847adf54ac9fac5f831e5f4935fe | |
| parent | c96a1dae1d6700b36dd7d0bb2432c55bff2cb396 [diff] | |
| parent | cf3901168be8fb78b45cef10e048960650f7b937 [diff] |
resolved conflicts for merge of cf390116 to jb-dev-plus-aosp Change-Id: Ia215d78fbeefc59ccd1868fe1365f4260b561e24