| commit | e749c32a866b41702168812430ea74201c23e687 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 09:13:45 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 09:13:45 2012 -0800 |
| tree | f6963754bee3000f47369d0fa4328ab49d6d4e1e | |
| parent | 1d136862c9b6d0c013527b29d7799ae3da2d9a82 [diff] | |
| parent | 948a38658241c8379e6efc743cd3a70a71d37421 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I1a96613d0058bf7a86861a7d8e7a576ffd6e7cb1