| commit | 2f37bd39217177fc2d49b07a9d1b2821d3177e80 | [log] [tgz] |
|---|---|---|
| author | Nicolas Prevot <nprevot@google.com> | Mon Jun 29 17:41:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 17:41:26 2015 +0000 |
| tree | 12f536545d97f6f59296e9d2e8c35ce4e6719975 | |
| parent | 9d6dcb7542d7c37c459d0c927295e8be81c949e0 [diff] | |
| parent | d1d1a700501242cca06b5729c2bd888d6f2d4d52 [diff] |
am d1d1a700: am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev * commit 'd1d1a700501242cca06b5729c2bd888d6f2d4d52': Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING