| commit | 08d7f2f95ad2240d45d89883fce434c5d5110602 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Sat Sep 22 01:50:33 2012 +0900 |
| committer | Ken Wakasa <kwakasa@google.com> | Sat Sep 22 01:50:33 2012 +0900 |
| tree | 9ac2bf35bc2372dcfe9a4ca46cf6c0d4e935d36e | |
| parent | c613f1e7ab44aa99296c42fb022bfb28b47f2c75 [diff] | |
| parent | b1fbd696de3f34696b9ce2dd7fb481abd0de8c3b [diff] |
resolved conflicts for merge of b1fbd696 to jb-mr1-dev bug:6809603 Change-Id: I23dcf45892d94db88f424a4ee0ae440a2c743d9b