| commit | 5288ef70edc3c2b12794a9d018c0aaa953ccebf4 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Mon Jul 08 12:12:14 2013 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Mon Jul 08 12:12:14 2013 -0700 |
| tree | db95882055bfad22801d1f7bf12d85ab630c1bce | |
| parent | 0ca50a3db89bdf99240f583a96b93c24290d5c93 [diff] | |
| parent | 1cec2593103dc175a9ca267cb3f3a4760e2d36a4 [diff] |
resolved conflicts for merge of 1cec2593 to jb-mr1-dev-plus-aosp Change-Id: I4a8efbdeff28e5fba4a7a25002ab6a2856b34fd5