| commit | d76ff19a0f358d1b6473c33157c5ace2128d9623 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Mar 28 00:11:20 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 28 00:11:20 2013 +0000 |
| tree | b35214177dd637ade7e04c1682513cb2223b4272 | |
| parent | ffbeac3f47d192e96c901189a3f5bd2fd4407a97 [diff] | |
| parent | 8c374054b3d4ffc6e77a1b1d6248215d0ce3e462 [diff] |
Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev