[automerger skipped] Merge "Add timestamp and read status extra constants to MAP Client" am: 9dd24d05e9 am: b441d2575a -s ours
am:d8ff56a96d-s ours am skip reason: change_id Ic0f04640f1894d6cf336ba7e641df9cf148a2bbd with SHA140aa11ead0is in history Change-Id: Id14c7758ae365e89afa60835e6205d57ac1e145b
This commit is contained in: