| commit | abfb25226aabdbda7f8900e923754beb7f8cb94d | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Mon Nov 12 12:50:03 2012 -0800 |
| committer | Andrew Hsieh <andrewhsieh@google.com> | Mon Nov 12 12:50:03 2012 -0800 |
| tree | a64f5a7afef2bbfca702b37f96f2ce26c52a1142 | |
| parent | bc4bcf4ad0d4be53235e949098b7cbd45b30b8c8 [diff] | |
| parent | 8b3ce5a3c7e8dc9a13d2ca69687aaff3cb7e4458 [diff] |
resolved conflicts for merge of 8b3ce5a3 to stage-aosp-master Change-Id: I588a055812ddc8f4531c9d02994beb366f9aab3e