commit | bd219806c37a38825fb89c889396c80a6445554a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:17:01 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:17:01 2012 -0700 |
tree | 20162ac3c40c2ddd972ea76c171ec26723cbb56d | |
parent | ea54f651b0210d003ff5137d7ef7b34bc7677349 [diff] | |
parent | 071fde625a3eb05cb6a54da97c3f2f3515b02640 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I92e095e0ea2a4ce39286a4b132d2ae0c68eb5e7a