| commit | cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Oct 07 14:59:03 2010 -0700 |
| committer | Ying Wang <wangying@google.com> | Thu Oct 07 14:59:03 2010 -0700 |
| tree | 1b84129a0dc81da7674e24411cfbcf57b61c9819 | |
| parent | a3088c433ed5deb775d390f2b22df40dc0194950 [diff] | |
| parent | de14fbd4b15937058889a7b33ede311850b44853 [diff] |
resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp Change-Id: I53302710ca0698daa5fe8ca3ce631a70d1578463