| commit | 13871a8f500b0f9a5e167be3487c1e8d1f92f327 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Sep 13 17:50:29 2013 -0700 |
| committer | Ying Wang <wangying@google.com> | Fri Sep 13 17:50:29 2013 -0700 |
| tree | 6d507106d1bcf75c4dcdc695bea4b980efd8208a | |
| parent | 87ceb423a74ff1a0788da57873bc99c76512b609 [diff] | |
| parent | 65d5e7886565ebf094e87dcf3d2c9ffa80afca4f [diff] |
resolved conflicts for merge of 65d5e788 to klp-dev-plus-aosp Change-Id: Iad8793c5e53b239425e9bba1b6a925265ff8d130