| commit | f786331925d50c2235f298e39880a9a05670b0dd | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Tue May 20 23:35:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 23:35:46 2014 +0000 |
| tree | e85fe75fc919f46edc7e9ab9cbf5eeb672ed433f | |
| parent | 9d0a4a6eca86933e9cd1fd60ba8cc0abae351b2a [diff] | |
| parent | 261307bebe8986599055bb97d5587977c8da53eb [diff] |
am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master * commit '261307bebe8986599055bb97d5587977c8da53eb': Fix SDK build.