| commit | 0b527dec873787906188e0b6325eb6bd7f32af26 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Tue Mar 11 12:43:28 2014 -0700 |
| committer | Yorke Lee <yorkelee@google.com> | Tue Mar 11 12:43:28 2014 -0700 |
| tree | 64f1e2914e2ad46dfb459aa6198da31eb50fa459 | |
| parent | 30234eea7257b170d48db1d085d3c9c2da84b534 [diff] | |
| parent | 899205564599ba3cff49627ba6a6625e14c42c0b [diff] |
Merge commit 'ec9354f7' into manualmerge Conflicts: src/com/android/incallui/InCallActivity.java Change-Id: I8b46150eefe5b477feeb2ea33c86d0dbaba05f31