| commit | 4d62456e211a0b4cd77a8967417340612994cb6c | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Oct 03 16:42:06 2012 -0700 |
| committer | Scott Main <smain@google.com> | Wed Oct 03 16:42:06 2012 -0700 |
| tree | 3310b6924a72e784d49ee4386ca95d178cb92693 | |
| parent | 25a9144bf8728f24a87ca21f9e1c19c5fcc9abdc [diff] | |
| parent | f15f8a1b441d8fb1d2548e1ce04000b1681a6d66 [diff] |
resolved conflicts for merge of f15f8a1b to jb-dev Change-Id: Ic20777658426aa27304858dd51f315ee967a7bfa