diff options
| author | John Spurlock <jspurlock@google.com> | 2013-10-15 16:18:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-15 16:18:07 -0700 |
| commit | a943b0337c7e18e9dd37d586dc8cfb08d36b72a1 (patch) | |
| tree | f9d1324e40b6aa986b134320d3fc8a632756d5a8 /docs/html/sdk/api_diff/11 | |
| parent | dcea5eb5db0f3ff44b1b7213ba0d25f5b52ee160 (diff) | |
| parent | c5b6267dac35300821e6b6e062370d0ee935acc1 (diff) | |
am c5b6267d: resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp
* commit 'c5b6267dac35300821e6b6e062370d0ee935acc1':
Update resource name for renamed string.
Diffstat (limited to 'docs/html/sdk/api_diff/11')
0 files changed, 0 insertions, 0 deletions