| commit | 22311914821f173446bfc01588b3b56da3d1b94c | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri Mar 13 22:40:38 2015 -0700 |
| committer | Tao Bao <tbao@google.com> | Fri Mar 13 22:40:38 2015 -0700 |
| tree | 66c9e844f21436a331783af070ca9a99778e448b | |
| parent | d4ca3b38d9477cd8f163de75bff24cc97071f210 [diff] | |
| parent | 6502ae93e11e247d378402c43d4506d4e611f953 [diff] |
resolved conflicts for merge of 6502ae93 to lmp-mr1-dev-plus-aosp Change-Id: I3ffed7f5a32363d5a4481eebddff8feff3c4ebee