| commit | 441e9452488ccb98f7b0a7690b86fcdff733e5f0 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Mar 26 17:06:33 2014 -0700 |
| committer | Colin Cross <ccross@android.com> | Wed Mar 26 17:06:33 2014 -0700 |
| tree | 8a24aded926c02d608be653f609e318b4714a2f2 | |
| parent | c8fea2ae9859c68e3d48c4e65ada7331daab11f0 [diff] | |
| parent | f3e25fea3a05373890b236aba51ce7c4957b6802 [diff] |
resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aosp Change-Id: I7b002780d8282b54821e8761198bc0af3e7ce71e