| commit | c955c6b52cbf71b83ccfcdba8ed29a8be66575e5 | [log] [tgz] |
|---|---|---|
| author | Ricardo Cerqueira <ricardo@cyngn.com> | Thu Nov 05 01:56:24 2015 +0000 |
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | Thu Nov 05 01:56:24 2015 +0000 |
| tree | 1419ce4158924cff775e0dec8b0b5df1c6202eea | |
| parent | a6e4531a9fe6116d183e171c7d216b1d77f02f15 [diff] | |
| parent | c203801527180e9dd2b4048e9eb3334e736f67d2 [diff] |
Merge tag 'android-6.0.0_r26' into HEAD Android 6.0.0 release 26 Conflicts: res/values/strings.xml src/com/android/incallui/Call.java src/com/android/incallui/CallCardFragment.java src/com/android/incallui/CallCardPresenter.java src/com/android/incallui/StatusBarNotifier.java Change-Id: Id922c35f6802ae6205b8bfa7002d9585c940d3f9