| commit | 4f48d974410137961fc06139aa44ae038269705b | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Fri Apr 19 09:34:28 2013 -0700 |
| committer | Adam Powell <adamp@google.com> | Fri Apr 19 09:35:00 2013 -0700 |
| tree | 338505b48a6eb30acee1bb84542b22b9848c58b7 | |
| parent | 43b9e5a83b6c9a8d0e62be2a316c81934c5d0e98 [diff] | |
| parent | b105894b1b032d00e8117998cbf5f44f20dcaab7 [diff] |
resolved conflicts for merge of b105894b to jb-mr2-dev Change-Id: Ifa617d1807d29e91998d98482e50bdd40ee61b1a