| commit | 09b53849b2f85e1c1bf7ab471718c5013a9ba2dc | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Mon Nov 24 00:59:50 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 24 00:59:51 2014 +0000 |
| tree | a6a006bdb69387bbd7df250e84ee1624a8f45503 | |
| parent | 33c05d3d8bf97bc8748d573858f2330c69902922 [diff] | |
| parent | ac23e53289ad1d67a96632959c3ac512f12d2e39 [diff] |
Merge "Fix bad merge in Telecom" into lmp-mr1-dev