commit | f6f431c2d81fffccb5171e5e5b227e841c1ceb7e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 12:06:44 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 12:06:44 2013 -0700 |
tree | 8ad2449ee581d15a30db66a19fa8bb8f6a20af55 | |
parent | f469a0bb0221eea434f4ece795fe9dba390fd3a2 [diff] | |
parent | 2f0e9505248dc19d7fcfed4c1efd7c3daf863f03 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I01671fe532f8a0807e4bfd86c51f169e93b3d54a