commit | da13b894ec13c975b027b78fa7a6ff07208c8fd3 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 11:47:35 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 11:47:35 2012 -0800 |
tree | c602b8bece5dcebc305f2f556bf5a552dd6c8703 | |
parent | ae6428d7072fcad3545fefe603afbaefb8f6bbec [diff] | |
parent | 22eee8791b2896305a93b759a90e2d50c1a5f333 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I60d1dd7a490e86c1194da929483347f99b9f421d