| commit | d5f641a620e7f6f253bf7fd8a56cb876857712ea | [log] [tgz] |
|---|---|---|
| author | Andy McFadden <fadden@android.com> | Wed Dec 11 14:58:56 2013 -0800 |
| committer | Andy McFadden <fadden@android.com> | Wed Dec 11 14:59:41 2013 -0800 |
| tree | 5723fe57d49094194791e80ea028565955d2025c | |
| parent | 1c2a66fea852cb8a5228fabef17f85cac1bef5ec [diff] | |
| parent | ca084e884c299320e6369d5d73ac02728bcba668 [diff] |
Merge commit 'ca084e88' into manualmerge Doing a "merge -s ours" since the changes are already in master. Change-Id: Id8cf832d5f2d30ec880d91c0392a53d5fcfe54f3